From 9c30ae02ee0319755105732b968e9f1be55e2061 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 18 Jul 2011 18:12:06 +0200 Subject: [PATCH] toolbar: Use gtk_widget_class_set_accessible_role() --- gtk/a11y/gtkcontaineraccessible.c | 5 +---- gtk/gtktoolbar.c | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gtk/a11y/gtkcontaineraccessible.c b/gtk/a11y/gtkcontaineraccessible.c index ae01adc87a..71f35d09d0 100644 --- a/gtk/a11y/gtkcontaineraccessible.c +++ b/gtk/a11y/gtkcontaineraccessible.c @@ -164,10 +164,7 @@ gtk_container_accessible_real_initialize (AtkObject *obj, g_signal_connect (data, "add", G_CALLBACK (gtk_container_accessible_add_gtk), obj); g_signal_connect (data, "remove", G_CALLBACK (gtk_container_accessible_remove_gtk), obj); - if (GTK_IS_TOOLBAR (data)) - obj->role = ATK_ROLE_TOOL_BAR; - else - obj->role = ATK_ROLE_PANEL; + obj->role = ATK_ROLE_PANEL; } static void diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 737a5f065a..d9f93fc8b4 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -381,6 +381,8 @@ gtk_toolbar_class_init (GtkToolbarClass *klass) widget_class->style_updated = gtk_toolbar_style_updated; widget_class->focus = gtk_toolbar_focus; + gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_TOOL_BAR); + /* need to override the base class function via override_class_handler, * because the signal slot is not available in GtkWidgetClass */ -- 2.30.2